Add and use GDK_CHECK_DEBUG macro

This is following what we've already done in GTK+. It avoids
direct access to _gdk_debug_flags all over the place.

diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c
index 82d40cf82f82d7b341189ad7740b5a3a17e41fe4..0d7e000c5b62af02623f0ae56da039e48fce1742 100644 (file)
--- a/gdk/gdkframeclockidle.c
+++ b/gdk/gdkframeclockidle.c
@@ -386,7 +386,7 @@ gdk_frame_clock_paint_idle (void *data)
             {
              int iter;
 #ifdef G_ENABLE_DEBUG
-              if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
+              if (GDK_DEBUG_CHECK (FRAMES))
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_LAYOUT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT))
@@ -415,7 +415,7 @@ gdk_frame_clock_paint_idle (void *data)
           if (priv->freeze_count == 0)
             {
 #ifdef G_ENABLE_DEBUG
-              if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
+              if (GDK_DEBUG_CHECK (FRAMES))
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_PAINT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT))
@@ -441,7 +441,7 @@ gdk_frame_clock_paint_idle (void *data)
               priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
 
 #ifdef G_ENABLE_DEBUG
-              if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
+              if (GDK_DEBUG_CHECK (FRAMES))
                 timings->frame_end_time = g_get_monotonic_time ();
 #endif /* G_ENABLE_DEBUG */
             }
@@ -452,7 +452,7 @@ gdk_frame_clock_paint_idle (void *data)
     }
 
 #ifdef G_ENABLE_DEBUG
-  if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
+  if (GDK_DEBUG_CHECK (FRAMES))
     {
       if (timings && timings->complete)
         _gdk_frame_clock_debug_print_timings (clock, timings);

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index bbcc2149b4c699b49af72f1a5af82340815106f9..ad1947eb21cda747eac3b2855f0cf7a18b222e27 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -113,12 +113,15 @@ extern gboolean _gdk_debug_updates;
 
 #ifdef G_ENABLE_DEBUG
 
-#define GDK_NOTE(type,action)                G_STMT_START { \
-    if (_gdk_debug_flags & GDK_DEBUG_##type)                \
+#define GDK_DEBUG_CHECK(type) G_UNLIKELY (_gdk_debug_flags & GDK_DEBUG_##type)
+
+#define GDK_NOTE(type,action)                G_STMT_START {     \
+    if (GDK_DEBUG_CHECK (type))                                 \
        { action; };                          } G_STMT_END
 
 #else /* !G_ENABLE_DEBUG */
 
+#define GDK_DEBUG_CHECK(type) 0
 #define GDK_NOTE(type,action)
 
 #endif /* G_ENABLE_DEBUG */

diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c
index 7b8fbd981f2cc309c361bebb257b61a726ae3e3d..8df9cced6b9ddea1dc5efe8ce3e55c51be26c015 100644 (file)
--- a/gdk/x11/gdkdevice-core-x11.c
+++ b/gdk/x11/gdkdevice-core-x11.c
@@ -345,7 +345,7 @@ gdk_x11_device_core_grab (GdkDevice    *device,
     xconfine_to = GDK_WINDOW_XID (confine_to);
 
 #ifdef G_ENABLE_DEBUG
-  if (_gdk_debug_flags & GDK_DEBUG_NOGRABS)
+  if (GDK_DEBUG_CHECK (NOGRABS))
     status = GrabSuccess;
   else
 #endif

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index ddeafa4182a2a8954acd4d29a50cf39c1869cc70..cd1849c51ea15162a5d45df0cf7f4c6a7dbb3b22 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -447,7 +447,7 @@ gdk_x11_device_xi2_grab (GdkDevice    *device,
                                                         &mask.mask_len);
 
 #ifdef G_ENABLE_DEBUG
-  if (_gdk_debug_flags & GDK_DEBUG_NOGRABS)
+  if (GDK_DEBUG_CHECK (NOGRABS))
     status = GrabSuccess;
   else
 #endif

diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
index a16f9313327229b9c0d14417241a994c113196bb..994d3599036d0b38a7b9c48282c55311ec07332c 100644 (file)
--- a/gdk/x11/gdkdevicemanager-core-x11.c
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
@@ -179,7 +179,7 @@ translate_key_event (GdkDisplay              *display,
   _gdk_x11_event_translate_keyboard_string (&event->key);
 
 #ifdef G_ENABLE_DEBUG
-  if (_gdk_debug_flags & GDK_DEBUG_EVENTS)
+  if (GDK_DEBUG_CHECK (EVENTS))
     {
       g_message ("%s:\t\twindow: %ld     key: %12s  %d",
                  event->type == GDK_KEY_PRESS ? "key press  " : "key release",

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index c58c29b9dfeb6813d85132d0e04d0deb672c25bc..64095b20e5f3c957e6a644ef150221d929ae4a98 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -590,7 +590,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
 
     case VisibilityNotify:
 #ifdef G_ENABLE_DEBUG
-      if (_gdk_debug_flags & GDK_DEBUG_EVENTS)
+      if (GDK_DEBUG_CHECK (EVENTS))
        switch (xevent->xvisibility.state)
          {
          case VisibilityFullyObscured:
@@ -1236,7 +1236,7 @@ _gdk_wm_protocols_filter (GdkXEvent *xev,
 
               timings->complete = TRUE;
 #ifdef G_ENABLE_DEBUG
-              if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
+              if (GDK_DEBUG_CHECK (FRAMES))
                 _gdk_frame_clock_debug_print_timings (clock, timings);
 #endif /* G_ENABLE_DEBUG */
             }

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index ed923baf1d5f9426cd31435b7dc5604144507d62..eceb8e9b5525083c558d0480793b4b05fb300e13 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -1500,7 +1500,7 @@ xdnd_read_actions (GdkX11DragContext *context_x11)
           context_x11->xdnd_have_actions = TRUE;
 
 #ifdef G_ENABLE_DEBUG
-          if (_gdk_debug_flags & GDK_DEBUG_DND)
+          if (GDK_DEBUG_CHECK (DND))
             {
               GString *action_str = g_string_new (NULL);
               if (context->actions & GDK_ACTION_MOVE)
@@ -1763,7 +1763,7 @@ xdnd_enter_filter (GdkXEvent *xev,
     }
 
 #ifdef G_ENABLE_DEBUG
-  if (_gdk_debug_flags & GDK_DEBUG_DND)
+  if (GDK_DEBUG_CHECK (DND))
     print_target_list (context->targets);
 #endif /* G_ENABLE_DEBUG */
 

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index b0c3cd6db49db3c92fb9a87312a2a249f628bcc2..82b8aa21325fd1e349101ee02766cf16df475b34 100644 (file)
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -526,7 +526,7 @@ init_fake_xinerama (GdkScreen *screen)
   Window win;
   gint w, h;
 
-  if (!(_gdk_debug_flags & GDK_DEBUG_XINERAMA))
+  if (!GDK_DEBUG_CHECK (XINERAMA))
     return FALSE;
   
   /* Fake Xinerama mode by splitting the screen into 4 monitors.

diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index e59ebf761e3b7645ffcace5ee79e8f2fdc2c3a63..81479d81f42a06722619102d2065075d0ec2f5da 100644 (file)
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -248,7 +248,7 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen)
     }
 
 #ifdef G_ENABLE_DEBUG
-  if (_gdk_debug_flags & GDK_DEBUG_MISC)
+  if (GDK_DEBUG_CHECK (MISC))
     {
       static const gchar *const visual_names[] =
       {

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 91a4e193f1fbf4a943fe58b5b3cac01a0aef3692..beb08a5da2dd219260e987438f87c51e9feacfd3 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -407,7 +407,7 @@ gdk_x11_window_end_frame (GdkWindow *window)
   if (impl->toplevel->current_counter_value % 2 == 1)
     {
 #ifdef G_ENABLE_DEBUG
-      if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
+      if (GDK_DEBUG_CHECK (FRAMES))
         {
           XImage *image = XGetImage (GDK_WINDOW_XDISPLAY (window),
                                      GDK_WINDOW_XID (window),